From 8c0516a5f10be4b0949dff1cfc72562fabffbe98 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 17 Sep 2013 15:52:27 +0200 Subject: [PATCH] window: Fix child wfh size request We need to subtract border_width from the size we're passing to the children hfw functions as those are added by ourselves. Fixes the window-border-width.ui reftest. --- gtk/gtkwindow.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 93422cbbd9..a8aecebcd9 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -7792,6 +7792,8 @@ gtk_window_get_preferred_width_for_height (GtkWidget *widget, border_width = gtk_container_get_border_width (GTK_CONTAINER (window)); + height -= 2 * border_width; + if (priv->decorated && !priv->fullscreen) { @@ -7896,6 +7898,8 @@ gtk_window_get_preferred_height_for_width (GtkWidget *widget, border_width = gtk_container_get_border_width (GTK_CONTAINER (window)); + width -= 2 * border_width; + if (priv->decorated && !priv->fullscreen) { -- 2.30.2